Revoke personal sessions when users are deactivated #5181
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Deploying matrix-authentication-service-docs with
|
| Latest commit: |
409f354
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://3a983a49.matrix-authentication-service-docs.pages.dev |
| Branch Preview URL: | https://rei-pat-revoke-on-deactivate.matrix-authentication-service-docs.pages.dev |
sandhose
reviewed
Oct 22, 2025
| let status = match self { | ||
| Self::Internal(_) => StatusCode::INTERNAL_SERVER_ERROR, | ||
| Self::UserNotFound => StatusCode::NOT_FOUND, | ||
| Self::UserDeactivated => StatusCode::GONE, |
| .await? | ||
| .ok_or(RouteError::UserNotFound)?; | ||
|
|
||
| if actor_user.deactivated_at.is_some() { |
Member
There was a problem hiding this comment.
maybe check just is_valid (assuming it does the right thing) so that we also check for locked status?
Contributor
Author
There was a problem hiding this comment.
now using is_valid_actor
| .table(PersonalSessions::Table) | ||
| .value(PersonalSessions::RevokedAt, revoked_at) | ||
| .and_where( | ||
| Expr::col((PersonalSessions::Table, PersonalSessions::PersonalSessionId)) |
Member
There was a problem hiding this comment.
That's a chunky subquery. I assume you need this because of the JOIN; could you stick in a comment explaining that? Also we could be doing that in a CTE, but not convinced the code would be clearer
Contributor
Author
There was a problem hiding this comment.
added some comments
yeah, it's a bit chunky, the sea-query doesn't help with that verbosity either, but hopefully the new comments make the intent clear
sandhose
approved these changes
Oct 22, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of: #4492
Revoke both personal sessions that are owned by, and acting as, the deactivated user.
Owned by because: it doesn't make sense for a deactivated user to be able to control themselves or other users, so them having active personal sessions is just confusing.
Acting as because: current precedent is that deactivated users are not controllable, even by admins.
To uphold this, the admin API is also fixed to stop allowing the creation of personal sessions for deactivated users.